merge with xen-unstable.hg

diff --cc tools/libxc/ia64/xc_ia64_linux_restore.c
Simple merge

diff --cc tools/libxc/ia64/xc_ia64_linux_save.c
Simple merge

diff --cc unmodified_drivers/linux-2.6/mkbuildtree
index 9e2803cd77e5163f5f2334e63e2ab74b6dd109ca,be6b1a6d94500be1158b63eb77d4b46ae13c20d8..ce0a1424475a21edcb6d58201fd5211c339c5f19
--- 1/unmodified_drivers/linux-2.6/mkbuildtree
--- 2/unmodified_drivers/linux-2.6/mkbuildtree
+++ b/unmodified_drivers/linux-2.6/mkbuildtree
@@@ -30,31 -37,26 +38,30 @@@ ln -sf ${XEN}/include/public include/xe
  case "$uname"
  in
  "x86_64")
-       ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/hypervisor.h include/asm
-       ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/hypercall.h include/asm
-       ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/synch_bitops.h include/asm
-       ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/maddr.h include/asm
-       ln -sf ${XL}/include/asm-i386 include/asm-i386
-       ;;
+     ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/hypervisor.h include/asm
+     ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/hypercall.h include/asm
+     ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/synch_bitops.h include/asm
+     ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/maddr.h include/asm
+     ln -sf ${XL}/include/asm-i386 include/asm-i386
+   ;;
  i[34567]86)
-       ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypervisor.h include/asm
-       ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypercall.h include/asm
-       ln -sf ${XL}/include/asm-i386/mach-xen/asm/synch_bitops.h include/asm
-       ln -sf ${XL}/include/asm-i386/mach-xen/asm/maddr.h include/asm
-       ;;
+     ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypervisor.h include/asm
+     ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypercall.h include/asm
+     ln -sf ${XL}/include/asm-i386/mach-xen/asm/synch_bitops.h include/asm
+     ln -sf ${XL}/include/asm-i386/mach-xen/asm/maddr.h include/asm
+   ;;
  "ia64")
-       ln -sf ${XL}/include/asm-ia64/hypervisor.h include/asm
-       ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
-       ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
-       ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
-       ln -sf ${XL}/include/asm-ia64/xen/xcom_hcall.h include/asm/xen
-       ln -sf ${XL}/include/asm-ia64/xen/xencomm.h include/asm/xen
-       ln -sf ${XL}/arch/ia64/xen/xcom_mini.c platform-pci
-       ln -sf ${XL}/arch/ia64/xen/xencomm.c platform-pci
-       ;;
+     ln -sf ${XL}/include/asm-ia64/hypervisor.h include/asm
+     ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
+     ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
+     ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
++    ln -sf ${XL}/include/asm-ia64/xen/xcom_hcall.h include/asm/xen
++    ln -sf ${XL}/include/asm-ia64/xen/xencomm.h include/asm/xen
++    ln -sf ${XL}/arch/ia64/xen/xcom_mini.c platform-pci
++    ln -sf ${XL}/arch/ia64/xen/xencomm.c platform-pci
+   ;;
  *)
-       echo unknown architecture $uname
-       exit 1
-       ;;
+     echo unknown architecture $uname
+     exit 1
+   ;;
  esac

diff --cc xen/arch/ia64/Rules.mk
Simple merge